Miscelaneous fixes and features: Set bugfixes, Conntrack zone support, FIB support #55
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 4 commits
January 29, 2024 13:50
I found two issues while attempting to create a set: 1. A straight forward bug on the ntf_set macro: expect call were called in non option or result types. 2. A not as straight forward issue, where all sets created had both the anonymous and constant flag. The anonymous one definitely should not be there, because we are creating a named set. The constant flag should be optional somehow. It doesn't really break my use case, but I didn't want it to be there, so I removed it.
Not really sure about this one, but just followed what was done for the other primitives.
faern
reviewed
Jul 19, 2024
| @@ -45,6 +46,9 @@ impl Conntrack { | |||
| Conntrack::State => libc::NFT_CT_STATE as u32, | |||
| Conntrack::Status => libc::NFT_CT_STATUS as u32, | |||
| Conntrack::Mark { .. } => libc::NFT_CT_MARK as u32, | |||
| // TODO: Update this once libc has definitions for NFT_CT_ZONE | |||
| // (https://github.com/rust-lang/libc/issues/3566) | |||
| Conntrack::Zone { .. } => 17 as u32, | |||
There was a problem hiding this comment.
Cool. Can you submit a PR to libc? We won't merge this with a hardcoded constant.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Folks, as I attempted to rewrite MozVPN Linux netfilter code in Rust I bumped into a few issues that are addressed in this PR.
Setcreation andnft_setmacro bugs: 50915b6I also learned about missing definitions on libc, I'll send a PR up there at some point as well. You'll notice I used some hradcoded numbers here and that is the reason. For reference: rust-lang/libc#3566
The MozVPN PR is not up yet, but I'll link to it here once it is. Cheers!
This change is